Merge branch 'master' into multiline_assert
authorSquirrel <gilescope@gmail.com>
Wed, 21 Jun 2017 10:15:17 +0000 (11:15 +0100)
committerGitHub <noreply@github.com>
Wed, 21 Jun 2017 10:15:17 +0000 (11:15 +0100)

Trivial merge